Merge remote-tracking branch 'origin/lovestory' into lovestory

Conflicts:
	Gruntfile.js
	main.js
Merge remote-tracking branch 'origin/lovestory' into lovestory