Set Maven plug-in to use JDK 1.7 to build, so importing in Eclipse does not set required bundle to JDK 1.5 on each Update.

Conflicts:
	maven-plugin/pom.xml

* Adding .idea/workspace.xml based on discussion in caas chat. These are personal settings for IntelliJ IDE and should not be checked in.