Merge commit 'ca2bff462f2355681979c5822f833def4e79d619'

Conflicts:
	app/src/main/java/com/hawkit/app/activities/HomeActivity.java
	app/src/main/java/com/hawkit/app/fragments/HomeListingsFragment.java
	app/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/Hawk-It/HawkItAndroidApp