first stage of linked data working
working linked data querying in place
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.