working on back end validation
Merge branch 'master' of github.com:tonyvance/estimator
Merge branch 'master' of github.com:tonyvance/estimator
Getting ng-grid working with propelsoa
fscking hate the way propel touches/edits every class when regenerating
pushing migration up
Merge branch 'master' of github.com:tonyvance/estimator
Merge branch 'master' into user_management

Conflicts:
	src/SOA/SOABundle/Controller/ModelBasedServiceController.php
working user management with password resetting.
working user management with validation
Fixing irrelevant references
Merge branch 'master' of github.com:tonyvance/estimator
Adding additional fields to user management and remerging user_management branch to get latest working code