UserProfile updated with relation to TagWord
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/UserProfile.java
Undo changes and make the project compile