Merge
Merge branch 'master' of http://github.com/tsuwatch/ma9

Conflicts:
	edison/public/js/app.min.js