Changes in .history
Added sql evolution script, Comment model, comments view, comments controller, etc.

-Compiles but has runtime error.
-Linked comments view to sign in button for the sake of testing.
Configured conf files to support hibernate
Switched to ebean management model and added test data/page
Updated 2.sql with table inserts
Seeded comment table, defined basic post view, and populated view with comments
Deleted global and created separate yml to reduce merge conflicts
Cleaning of play files
Play files
Merge branch 'commentModel'

Conflicts:
	.classpath
	.gitignore
	app/Global.java
	app/controllers/Application.java
	conf/application.conf
	conf/routes
	logs/application.log

project/target/resolution-cache/default/ockb-build/scala_2.10/sbt_0.13/0
.1-SNAPSHOT/resolved.xml.properties

project/target/resolution-cache/default/ockb-build/scala_2.10/sbt_0.13/0
.1-SNAPSHOT/resolved.xml.xml

project/target/resolution-cache/reports/default-ockb-build-compile-inter
nal.xml
	project/target/resolution-cache/reports/default-ockb-build-compile.xml
	project/target/resolution-cache/reports/default-ockb-build-docs.xml
	project/target/resolution-cache/reports/default-ockb-build-optional.xml
	project/target/resolution-cache/reports/default-ockb-build-plugin.xml
	project/target/resolution-cache/reports/default-ockb-build-pom.xml
	project/target/resolution-cache/reports/default-ockb-build-provided.xml

project/target/resolution-cache/reports/default-ockb-build-runtime-inter
nal.xml
	project/target/resolution-cache/reports/default-ockb-build-runtime.xml

project/target/resolution-cache/reports/default-ockb-build-scala-tool.xm
l
	project/target/resolution-cache/reports/default-ockb-build-sources.xml

project/target/resolution-cache/reports/default-ockb-build-test-internal
.xml
	project/target/resolution-cache/reports/default-ockb-build-test.xml
	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/play-ockb/play-ockb_2.10/1.0-SNAPSHOT/resolved.x
ml.properties

target/resolution-cache/play-ockb/play-ockb_2.10/1.0-SNAPSHOT/resolved.x
ml.xml

target/resolution-cache/reports/play-ockb-play-ockb_2.10-compile-interna
l.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-compile.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-docs.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-optional.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-plugin.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-pom.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-provided.xml

target/resolution-cache/reports/play-ockb-play-ockb_2.10-runtime-interna
l.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-runtime.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-scala-tool.xml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-sources.xml

target/resolution-cache/reports/play-ockb-play-ockb_2.10-test-internal.x
ml
	target/resolution-cache/reports/play-ockb-play-ockb_2.10-test.xml
	target/scala-2.10/cache/ockb/compile/play_instrumentation
	target/scala-2.10/cache/ockb/global/copy-assets
	target/scala-2.10/classes/Routes$$anonfun$documentation$1.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
1$$anonfun$apply$1.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
1.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
2$$anonfun$apply$2.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
2.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
3$$anonfun$apply$3.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
3.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
4$$anonfun$apply$4.class

target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$
4.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1.class
	target/scala-2.10/classes/Routes$.class
	target/scala-2.10/classes/Routes.class
	target/scala-2.10/classes/application.conf
	target/scala-2.10/classes/controllers/Application.class
	target/scala-2.10/classes/controllers/ReverseApplication.class
	target/scala-2.10/classes/controllers/ReverseAssets.class

target/scala-2.10/classes/controllers/javascript/ReverseApplication.clas
s
	target/scala-2.10/classes/controllers/javascript/ReverseAssets.class

target/scala-2.10/classes/controllers/ref/ReverseApplication$$anonfun$ex
plore$1.class

target/scala-2.10/classes/controllers/ref/ReverseApplication$$anonfun$in
dex$1.class

target/scala-2.10/classes/controllers/ref/ReverseApplication$$anonfun$su
bmit$1.class
	target/scala-2.10/classes/controllers/ref/ReverseApplication.class

target/scala-2.10/classes/controllers/ref/ReverseAssets$$anonfun$at$1.cl
ass
	target/scala-2.10/classes/controllers/ref/ReverseAssets.class
	target/scala-2.10/classes/routes
	target/scala-2.10/classes/views/html/main$.class
	target/scala-2.10/classes_managed/Routes$$anonfun$documentation$1.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$1$$anonfun$apply$1.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$1.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$2$$anonfun$apply$2.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$2.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$3$$anonfun$apply$3.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$3.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$4$$anonfun$apply$4.class

target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$appl
yOrElse$4.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1.class
	target/scala-2.10/classes_managed/Routes$.class
	target/scala-2.10/classes_managed/Routes.class
	target/scala-2.10/classes_managed/controllers/ReverseApplication.class
	target/scala-2.10/classes_managed/controllers/ReverseAssets.class

target/scala-2.10/classes_managed/controllers/javascript/ReverseApplicat
ion.class

target/scala-2.10/classes_managed/controllers/javascript/ReverseAssets.c
lass

target/scala-2.10/classes_managed/controllers/ref/ReverseApplication$$an
onfun$explore$1.class

target/scala-2.10/classes_managed/controllers/ref/ReverseApplication$$an
onfun$index$1.class

target/scala-2.10/classes_managed/controllers/ref/ReverseApplication$$an
onfun$submit$1.class

target/scala-2.10/classes_managed/controllers/ref/ReverseApplication.cla
ss

target/scala-2.10/classes_managed/controllers/ref/ReverseAssets$$anonfun
$at$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseAssets.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/explore.template.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/submit.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
Merge