profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/iust/panta/Profile.java