Merge branch 'master' of https://github.com/Hawk-It/HawkItAndroidApp into noItemsState
Merge branch 'noItemsState' of https://github.com/Hawk-It/HawkItAndroidApp into noItemsState