add site app
Merge branch 'master' of github.com:krongk/tm_wed

Conflicts:
	app/models/templates/template.rb