commit test

yes
Merge branch 'development' of https://github.com/alpha1337/Avalon into development

Conflicts:
	css/bootstrap.css
	less/avalon.less