Add ingore files.
Remove grunt generated files.
Merge branch 'master' into riversyang

Conflicts:
	public/tl/js/main.min.js
	public/tl/js/templates.js
	public/tl/js/templates.min.js