modify alloy file
modify
modify index.js
Merge branch 'master' of github.com:lunckjack/soryin

Conflicts:
	Resources/alloy/controllers/index.js
	Resources/alloy/controllers/view_filter.js
	Resources/alloy/controllers/view_record.js
	Resources/alloy/controllers/view_setting.js
	Resources/fonts/soryin.ttf
	app/alloy.js
	app/assets/fonts/soryin.ttf
	app/controllers/index.js
	app/styles/index.tss