Refactoring
Merge branch 'master' of https://github.com/dragoon20/IF3038-2013

Conflicts:
	src_java/models/User.java