no message
Merge branch 'development' of https://github.com/barterli/barterli_android into development

Conflicts:
	barter.li/src/li/barter/fragments/AboutUsPagerFragment.java