Merge branch '31-internationalization-translations' into staging
Handling controllers without localized flag well
Merge branch '31-internationalization-translations' into staging

Conflicts:
	application/hooks/Unmark_Localization.php
Merge branch '31-internationalization-translations' into staging
Merge branch '31-internationalization-translations' into staging
Merge branch '31-internationalization-translations' into staging

Conflicts:
	assets/css/unmark.css
	assets/css/unmark_welcome.css
	assets/js/production/unmark.bookmarklet.js
	assets/js/production/unmark.loggedin.js
	assets/js/production/unmark.loggedout.js
	assets/js/production/unmark.plugins.js
Merge branch 'twitter-update' into staging
Minor JS updates
Sidebar Link Updates
Merge branch '50-migration-schema-update' into staging

Conflicts:
	assets/css/unmark.css
	assets/css/unmark_welcome.css
	assets/js/production/unmark.bookmarklet.js
	assets/js/production/unmark.loggedin.js
	assets/js/production/unmark.loggedout.js
	assets/js/production/unmark.plugins.js
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'staging'