changes
merge
Merge branch 'master' of https://github.com/ringlas/huarang

Conflicts:
	public/javascripts/import.js