keep project dir
Merge branch 'master' of github.com:ahaid/lp-swagger

Conflicts:
	project/target/resolution-cache/default/lp-swagger-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.properties
	project/target/resolution-cache/default/lp-swagger-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-compile-internal.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-compile.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-docs.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-optional.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-plugin.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-pom.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-provided.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-runtime-internal.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-runtime.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-scala-tool.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-sources.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-test-internal.xml
	project/target/resolution-cache/reports/default-lp-swagger-build-test.xml
	project/target/streams/$global/update/$global/out
	project/target/streams/$global/update/$global/output
	target/.history
	target/resolution-cache/com.ahaid/lp-swagger_2.10/0.0.1-SNAPSHOT/resolved.xml.properties
	target/resolution-cache/com.ahaid/lp-swagger_2.10/0.0.1-SNAPSHOT/resolved.xml.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-compile-internal.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-compile.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-container.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-docs.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-optional.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-plugin.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-pom.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-provided.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-runtime-internal.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-runtime.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-scala-tool.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-scalate.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-scoverage-test.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-scoverage.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-sources.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-test-internal.xml
	target/resolution-cache/reports/com.ahaid-lp-swagger_2.10-test.xml
	target/streams/$global/update/$global/out
	target/streams/$global/update/$global/output