reject code
Merge branch 'master' of github.com:anrob/wtasystem

Conflicts:
	config/routes.rb