OZP-648: Cleaning up git tmp file
OZP-64: Adding logic to handle 'me' as user id
OZP-648: Modifying rest bundle into a wab
OZP-648: Changing REST bundle to use blueprint to register servlets
OZP-648: Fixing the build
Merge branch 'master' into feature/ozp-648-current-user

Conflicts:
	bundles/server/services-impl/src/main/groovy/org/ozoneplatform/owf/server/service/impl/PersonServiceImpl.groovy
OZP-648: further work on getting spring working
Revert "OZP-648: Changing REST bundle to use blueprint to register servlets"

This reverts commit 06c0d10485ece22f27263d47a0c962284f86d124.

Conflicts:
	bundles/server/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
OZP-648: Working on wab with spring
OZP-509 - made changes so that serverConfig is a proper requirejs module
OZP-648: Setting up WebApplicationContext in web.xml
OZP-509 - made changes so that serverConfig is a proper requirejs module
OZP-648: Adding services and jaxrs:server configuration to spring context
OZP-648: getting current user
Merge branch 'master' into feature/ozp-648-current-user
Deleted blueprint file from REST bundle
OZP-16: fixing merge conflicts from pulling in master.