Merge branch 'suapiv2' into 'master'

I don't have time to finish reviewing this tonight I'm afraid. It's a good start, but there's enough little errors that I would suggest holding off on merging this to beta until its had a proper check through - either by myself when I get time or another set of eyes.

I think a lot of this code could be laid out a bit better (Although that goes for the whole site as well), while a rather small thing compared to actual bugs in the site the highly inconsistent use of spaces throughout the code makes some parts hard to understand. It should also be split up more into blocks by a blank line in-between blocks to help with readability.