Merge branch 'master' into create-post

Conflicts:
	modules/UshahidiUI/media/css/test/global.css
	modules/UshahidiUI/media/js/app/controllers/ModalController.js
	modules/UshahidiUI/media/js/app/templates/modals/CreatePost.html