Updates to file names, minor changes in code
Merge branch 'master' of github.com:talentagentapp/talent.dev

Conflicts:
	app/controllers/UsersController.php
	app/routes.php
	app/views/mock.blade.php
Conflicts resolved
Conflicts resolved
Merge pull request #20 from talentagentapp/audrey

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