OZP-648: Cleaning up git tmp file
OZP-64: Adding logic to handle 'me' as user id
OZP-16 Controller test updates
OZP-64 Preference Service update, fix for blueprint.xml file
Merge branch 'feature/ozp-150-create-dashboard'
OZP-75: Removed the domain bundle from REST services. The persistence feature will provide the domain bundle. This is necessary because the domain bundle that JPA uses has been byte code enhanced to work with OpenJPA
Removed deleted projects from pom
OZP-661: Change the default browser to Firefox to prevent PhantomJS crashes.
OZP-663 - Update OWF client pom files configuration to always pull in latest dependencies from repo.
OZP-15 - stubbing out launchmenu
OZP-663 - added more profiles so jenkins jobs can be more streamlined by only building the needed maven projects
OZP-663 - fixing overlapping files
OZP-75 Adjusted features to get rid of co-dependent features in commons. Co-dependent features cause errors when trying to install them at runtime
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-667 Updating version number in pom files
OZP-665 - renaming noJavaScript profile to skipJavaScript
OZP-507 - changes from code review