Added some user stuff and start of edit user comments
Merge branch 'james'

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/CreateCommentActivity.java
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/User.java