merge with master
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display

Conflicts:
	content display/src/main/java/com/apptitive/content_display/MainActivity.java