Added Facebook and AA
Merge branch 'master' of https://github.com/lucasloliveira/agendafunk

Conflicts:
	agenda-funk/src/main/java/br/com/agendafunk/activity/MainActivity.java