Merge together the activity type select and the button into a drop down menu and place it right beside the Back button
Merge branch 'master' of github.com:kurubee/web into devel