Merge pull request #14 from talentagentapp/audrey

Minor adjustments to existing files, one file added
commit with updated controllers for views
commit with controller updates
commit with changes to controllers for views
commit with updated controllers and basecontroller error fix
Merge pull request #16 from talentagentapp/adam

Adam
Updates to file names, minor changes in code
Merge pull request #18 from talentagentapp/audrey

Audrey
Merge branch 'master' of github.com:talentagentapp/talent.dev

Conflicts:
	app/controllers/UsersController.php
	app/routes.php
	app/views/mock.blade.php
Conflicts resolved