user controller changes (added  style to client side)
Merge branch 'master' of github.com:atib/tablet-gaylord

Conflicts:
	user/activation.php