commited
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/iust/panta/Profile.java
	app/src/main/res/layout/activity_profile.xml
	app/src/main/res/values/strings.xml
fix-commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/iust/panta/Profile.java
	app/src/main/res/layout/activity_profile.xml
	app/src/main/res/layout/activity_sign_up.xml