minor: usage of constants
Merge branch 'master' of https://github.com/gavra0/epfl-fb-hack

Conflicts:
	app/src/main/java/com/hackers/epfl/Constants.java