Updated the application after doing some testing with the server, fixed several bugs
Perfect server that bit more perfect
Merge pull request #6 from conorbrady/master

Server updates
Fixed application and added frontend after testing
Cleanup
Merge remote-tracking branch 'rogers/master'

Conflicts:
	ClockworksDSAApplication/AndroidManifest.xml
	ClockworksDSAApplication/bin/AndroidManifest.xml