Merge branch 'master' of https://github.com/mnill/helpstack-android into mnill-master

# Conflicts:
#	helpstack/src/com/tenmiles/helpstack/activities/EditAttachmentActivity.java

Author: anirudh24seven

helpstack/res/menu/hs_edit_attachment.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/attach"
         android:orderInCategory="1"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="@drawable/hs_action_accept"
         android:title="@string/hs_attach" />