updates
Merge branch 'master' of https://github.com/Mindful/favor

Conflicts:
	src/com/favor/ui/GraphBarActivity.java
	src/com/favor/ui/LoadFromContacts.java