Merge branch 'master' of https://github.com/FaceAppDSOO/FaceAPP_TrabalhoDSOO

Conflicts:
	src/br/com/dsoo/facebook/user/User.java
aaa

aaa
Merge branch 'master' of https://github.com/FaceAppDSOO/FaceAPP_TrabalhoDSOO

Conflicts:
	src/br/com/dsoo/facebook/user/User.java