link disabled
fix some bugs
Merge branch 'develop' of https://github.com/DonutWorks/Ari into feature/link-disabled

Conflicts:
	app/assets/javascripts/admin/notices.js
Merge pull request #290 from DonutWorks/feature/link-disabled

link disabled