FAIMS-769 Add action bar menu
Merge branch 'master' of github.com:IntersectAustralia/faims-android

Conflicts:
	faims-android-app/src/au/org/intersect/faims/android/ui/activity/ShowModuleActivity.java
Merge branch 'master' of github.com:IntersectAustralia/faims-android