fx
Merge branch 'master' of github.com:sorrymeika/Caipiao

Conflicts:
	assets/js/views/selector.js