Fix relating to #14 and some UI improvements
Merge branch 'master' of https://github.com/Reportd/project_wire

Conflicts:
	src/js/models/user.js