Removing unused import
Checkstyle - tabs and new line at end
Removing Ivy from Eclipse
Only run hsqldb by default - cannot assume all database libraries and tests databases available
Don't override version to same
Reference the OG public Maven repository
Launch target naming consistency and fixes
Ignore JavaScript files
Using Eclipse projects with Maven instead of Ivy
Removing .project and .classpath files (now automatically Maven-derived)
Removing .checkstyle files
Renaming checkstyle-lax to checkstyle; renaming checkstyle to checkstyle-strict
Adding OG public repositories; checkstyle configuration
Removing unnecessary version
Ignore Maven-derived Eclipse files
Remove .classpath
Merge remote-tracking branch 'origin/develop' into topic/maven

Conflicts:
	.project
	projects/OG-Analytics/.checkstyle
	projects/OG-Analytics/.classpath
	projects/OG-Analytics/.project
	projects/OG-Bloomberg/.checkstyle
	projects/OG-Bloomberg/.classpath
	projects/OG-Bloomberg/.project
	projects/OG-BloombergExample/.checkstyle
	projects/OG-BloombergExample/.classpath
	projects/OG-BloombergExample/.project
	projects/OG-BloombergExample/develop/BloombergExample server - fullstack-bloombergexample.launch
	projects/OG-Component/.checkstyle
	projects/OG-Component/.classpath
	projects/OG-Component/.project
	projects/OG-Core/.checkstyle
	projects/OG-Core/.classpath
	projects/OG-Core/.project
	projects/OG-Engine/.checkstyle
	projects/OG-Engine/.classpath
	projects/OG-Engine/.project
	projects/OG-Engine/src/main/java/com/opengamma/engine/value/ComputedValueResult.java
	projects/OG-Examples/.checkstyle
	projects/OG-Examples/.classpath
	projects/OG-Examples/.project
	projects/OG-Examples/develop/Example server - fullstack-example.launch
	projects/OG-Financial/.checkstyle
	projects/OG-Financial/.classpath
	projects/OG-Financial/.project
	projects/OG-Install/.classpath
	projects/OG-Install/.project
	projects/OG-Integration/.checkstyle
	projects/OG-Integration/.classpath
	projects/OG-Integration/.project
	projects/OG-Language/.checkstyle
	projects/OG-Language/.classpath
	projects/OG-Language/.project
	projects/OG-LiveData/.checkstyle
	projects/OG-LiveData/.classpath
	projects/OG-LiveData/.project
	projects/OG-Master/.checkstyle
	projects/OG-Master/.classpath
	projects/OG-Master/.project
	projects/OG-MasterDB/.checkstyle
	projects/OG-MasterDB/.classpath
	projects/OG-MasterDB/.project
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/CalculationConfiguration.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/ComputeHost.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/ComputeNode.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/HbComputationTargetSpecification.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/LiveDataField.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/MarketData.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/MarketDataValue.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/batch/domain/RiskRunProperty.hbm.xml
	projects/OG-MasterDB/src/main/java/com/opengamma/masterdb/batch/DbBatchMaster.elsql
	projects/OG-MasterDB/src/main/java/com/opengamma/masterdb/batch/DbBatchWriter.elsql
	projects/OG-Maths/.checkstyle
	projects/OG-Maths/.classpath
	projects/OG-Maths/.project
	projects/OG-MavenPlugin/.checkstyle
	projects/OG-MavenPlugin/.classpath
	projects/OG-Parent/pom.xml
	projects/OG-Provider/.checkstyle
	projects/OG-Provider/.classpath
	projects/OG-Provider/.project
	projects/OG-Security/.checkstyle
	projects/OG-Security/.classpath
	projects/OG-Security/.project
	projects/OG-Security/src/main/java/com/opengamma/security/auditlog/AuditLogEntry.hbm.xml
	projects/OG-Security/src/main/java/com/opengamma/security/user/Authority.hbm.xml
	projects/OG-Security/src/main/java/com/opengamma/security/user/UserGroup.hbm.xml
	projects/OG-Util/.checkstyle
	projects/OG-Util/.classpath
	projects/OG-Util/.project
	projects/OG-Web/.checkstyle
	projects/OG-Web/.classpath
	projects/OG-Web/.project
Removing ant/ivy build
Remove OG-MavenPlugin (moved contents to separate plugins in MavenPlugins repository)
Merge remote-tracking branch 'origin/develop' into topic/maven

Conflicts:
	.gitignore
	common/build.properties
	projects/OG-Analytics/develop/All OG Analytics Tests.launch
	projects/OG-Bloomberg/build.properties
	projects/OG-BloombergExample/build.properties
	projects/OG-BloombergExample/ivy.xml
	projects/OG-Component/build.properties
	projects/OG-Core/build.properties
	projects/OG-Engine/build.properties
	projects/OG-Engine/ivy.xml
	projects/OG-Examples/build.properties
	projects/OG-Examples/build.xml
	projects/OG-Financial/.classpath
	projects/OG-Financial/build.properties
	projects/OG-Financial/develop/All OG Basics Tests.launch
	projects/OG-Integration/.classpath
	projects/OG-Integration/build.properties
	projects/OG-Integration/ivy.xml
	projects/OG-Language/build.properties
	projects/OG-LiveData/build.properties
	projects/OG-LiveData/ivy.xml
	projects/OG-Master/build.properties
	projects/OG-MasterDB/build.properties
	projects/OG-MavenPlugin/.classpath
	projects/OG-MavenPlugin/.project
	projects/OG-MavenPlugin/OG-MavenPlugin.iml
	projects/OG-MavenPlugin/ivy.xml
	projects/OG-MavenPlugin/pom.xml
	projects/OG-MavenPlugin/src/main/java/com/opengamma/maven/scripts/ScriptableScriptGeneratorMojo.java
	projects/OG-Provider/build.properties
	projects/OG-Security/build.properties
	projects/OG-Security/ivy.xml
	projects/OG-Util/build.properties
	projects/OG-Util/develop/All OG Util Tests.launch
	projects/OG-Util/ivy.xml
	projects/OG-Util/src/main/java/com/opengamma/util/test/DbTest.java
	projects/OG-Web/build.properties