Merge branch 'master' of https://github.com/Simsadz/trustroots into Simsadz-master

Conflicts:
	public/modules/users/views/authentication/signup.client.view.html