Merge branch 'master' of https://github.com/songgz/FastExt

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/songgz/FastExt

Conflicts:
	app/assets/javascripts/fast_ext/app/view/VMenu.js