no message
Merge branch 'master' of https://github.com/RubyLouvre/avalon into base

Conflicts:
	.gitignore
	avalon.js
	avalon.mobile.js
Merge branch 'base' of https://github.com/ilife5/avalon into base