Merge branch 'master' into issue171

Conflicts:
	app/models/User.php
	composer.json
Adding some new .gitignores
Merge branch 'master' into issue171

Conflicts:
	app/models/User.php
	composer.json
Merge branch 'master' into issue171
Merge branch 'master' into issue171
Itermediate commit on groups, working on group management, etc.
Merge branch 'master' into issue148

Conflicts:
	.gitignore
	composer.json
Adding missing field to group
Implementing member management for groups.
Implementing adding users to a group
Implementing the admin ability to verify groups once they are created.
Adding a few more security-related checks and group verification checks
Merge branch 'master' into issue148

Conflicts:
	public/js/angular/controllers.js
Merge branch 'issue148'