sync2
Merge branch 'master' of https://github.com/sanpeim/Surferpedia

Conflicts:
	.classpath
	.settings/org.scala-ide.play2.prefs
	.settings/org.scala-ide.sdt.core.prefs
	logs/application.log

project/target/resolution-cache/default/surferpedia-build/scala_2.10/sbt
_0.13/0.1-SNAPSHOT/resolved.xml.properties

project/target/resolution-cache/default/surferpedia-build/scala_2.10/sbt
_0.13/0.1-SNAPSHOT/resolved.xml.xml

project/target/resolution-cache/reports/default-surferpedia-build-compil
e-internal.xml

project/target/resolution-cache/reports/default-surferpedia-build-compil
e.xml

project/target/resolution-cache/reports/default-surferpedia-build-docs.x
ml

project/target/resolution-cache/reports/default-surferpedia-build-option
al.xml

project/target/resolution-cache/reports/default-surferpedia-build-plugin
.xml

project/target/resolution-cache/reports/default-surferpedia-build-pom.xm
l

project/target/resolution-cache/reports/default-surferpedia-build-provid
ed.xml

project/target/resolution-cache/reports/default-surferpedia-build-runtim
e-internal.xml

project/target/resolution-cache/reports/default-surferpedia-build-runtim
e.xml

project/target/resolution-cache/reports/default-surferpedia-build-scala-
tool.xml

project/target/resolution-cache/reports/default-surferpedia-build-source
s.xml

project/target/resolution-cache/reports/default-surferpedia-build-test-i
nternal.xml

project/target/resolution-cache/reports/default-surferpedia-build-test.x
ml
	project/target/streams/$global/ivyConfiguration/$global/out
	project/target/streams/$global/update/$global/inputs
	project/target/streams/$global/update/$global/out
	project/target/streams/$global/update/$global/output
	project/target/streams/compile/dependencyClasspath/$global/export
	project/target/streams/compile/exportedProducts/$global/export

project/target/streams/compile/externalDependencyClasspath/$global/expor
t
	project/target/streams/compile/managedClasspath/$global/export
	project/target/streams/runtime/dependencyClasspath/$global/export
	project/target/streams/runtime/exportedProducts/$global/export

project/target/streams/runtime/externalDependencyClasspath/$global/expor
t
	project/target/streams/runtime/fullClasspath/$global/export

project/target/streams/runtime/internalDependencyClasspath/$global/expor
t
	project/target/streams/runtime/managedClasspath/$global/export
	target/.history

target/resolution-cache/reports/surferpedia-surferpedia_2.10-compile-int
ernal.xml

target/resolution-cache/reports/surferpedia-surferpedia_2.10-compile.xml
	target/resolution-cache/reports/surferpedia-surferpedia_2.10-docs.xml

target/resolution-cache/reports/surferpedia-surferpedia_2.10-optional.xm
l
	target/resolution-cache/reports/surferpedia-surferpedia_2.10-plugin.xml
	target/resolution-cache/reports/surferpedia-surferpedia_2.10-pom.xml

target/resolution-cache/reports/surferpedia-surferpedia_2.10-provided.xm
l

target/resolution-cache/reports/surferpedia-surferpedia_2.10-runtime-int
ernal.xml

target/resolution-cache/reports/surferpedia-surferpedia_2.10-runtime.xml

target/resolution-cache/reports/surferpedia-surferpedia_2.10-scala-tool.
xml

target/resolution-cache/reports/surferpedia-surferpedia_2.10-sources.xml

target/resolution-cache/reports/surferpedia-surferpedia_2.10-test-intern
al.xml
	target/resolution-cache/reports/surferpedia-surferpedia_2.10-test.xml

target/resolution-cache/surferpedia/surferpedia_2.10/1.0-SNAPSHOT/resolv
ed.xml.properties

target/resolution-cache/surferpedia/surferpedia_2.10/1.0-SNAPSHOT/resolv
ed.xml.xml
	target/scala-2.10/cache/surferpedia/compile/play_instrumentation
	target/scala-2.10/cache/surferpedia/global/copy-assets
	target/scala-2.10/classes/views/html/Index$.class
	target/scala-2.10/classes/views/html/Main$.class
	target/scala-2.10/classes_managed/views/html/Index$.class
	target/scala-2.10/classes_managed/views/html/Main$.class
	target/scala-2.10/src_managed/main/controllers/routes.java
	target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	target/scala-2.10/src_managed/main/routes_routing.scala
	target/scala-2.10/src_managed/main/views/html/Index.template.scala
	target/scala-2.10/src_managed/main/views/html/Main.template.scala
	target/scala-2.10/src_managed/main/views/html/Page1.template.scala
	target/scala-2.10/src_managed/main/views/html/cmoore.template.scala
	target/scala-2.10/src_managed/main/views/html/jakem.template.scala
	target/scala-2.10/src_managed/main/views/html/kalanid.template.scala
	target/scala-2.10/src_managed/main/views/html/souza.template.scala
	target/streams/$global/ivyConfiguration/$global/out
	target/streams/$global/playCopyAssets/$global/out
	target/streams/$global/update/$global/inputs
	target/streams/$global/update/$global/out
	target/streams/$global/update/$global/output
	target/streams/compile/compile/$global/export
	target/streams/compile/copyResources/$global/copy-resources
	target/streams/compile/copyResources/$global/out
	target/streams/compile/dependencyClasspath/$global/export
	target/streams/compile/exportedProducts/$global/export
	target/streams/compile/externalDependencyClasspath/$global/export
	target/streams/compile/incCompileSetup/$global/inc_compile
	target/streams/compile/managedClasspath/$global/export
	target/streams/runtime/dependencyClasspath/$global/export
	target/streams/runtime/exportedProducts/$global/export
	target/streams/runtime/internalDependencyClasspath/$global/export
	target/streams/test/externalDependencyClasspath/$global/export
	target/streams/test/managedClasspath/$global/export