Merge remote-tracking branch 'chris/master'

Conflicts:
	TV Tracker/src/com/goddammitus/tvtracker/client/AccountCreateView.java
	TV Tracker/src/com/goddammitus/tvtracker/server/LoginServiceImpl.java
Merge remote-tracking branch 'chris/master'
Adds "Cancel" button to AccountCreateView
Tidyied up the views and added error messages
Merge remote-tracking branch 'dan/master'

Conflicts:
	TV Tracker/src/com/goddammitus/tvtracker/client/AccountCreateView.java
	TV Tracker/src/com/goddammitus/tvtracker/server/LoginServiceImpl.java
Updated README
Merge pull request #5 from octotep/master

Error handling and good looking view