Fefe
Merge branch 'master' of github.com:krongk/tm_admin

Conflicts:
	app/views/templates/templates/index.html.erb