Pusha stuffinu
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	logs/application.log
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$1.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$11$$anonfun$apply$12.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$11.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$13$$anonfun$apply$14.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$13.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$3.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$5$$anonfun$apply$6.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$5.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$7$$anonfun$apply$8.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$7.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$9$$anonfun$apply$10.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$9.class
	target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1.class
	target/scala-2.9.1/classes_managed/Routes$.class
	target/scala-2.9.1/classes_managed/Routes.class
	target/scala-2.9.1/classes_managed/controllers/ReverseApplication.class
	target/scala-2.9.1/classes_managed/controllers/ReverseAssets.class
	target/scala-2.9.1/classes_managed/controllers/ReverseSession.class
	target/scala-2.9.1/classes_managed/controllers/ReverseSignUp.class
	target/scala-2.9.1/classes_managed/controllers/javascript/ReverseApplication.class
	target/scala-2.9.1/classes_managed/controllers/javascript/ReverseAssets.class
	target/scala-2.9.1/classes_managed/controllers/javascript/ReverseSession.class
	target/scala-2.9.1/classes_managed/controllers/javascript/ReverseSignUp.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseApplication$$anonfun$index$1.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseApplication.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseAssets$$anonfun$at$1.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseAssets.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseSession$$anonfun$authenticate$1.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseSession$$anonfun$login$1.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseSession$$anonfun$logout$1.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseSession.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseSignUp$$anonfun$blank$1.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseSignUp$$anonfun$submit$1.class
	target/scala-2.9.1/classes_managed/controllers/ref/ReverseSignUp.class
	target/scala-2.9.1/src_managed/main/controllers/routes.java
	target/scala-2.9.1/src_managed/main/routes_reverseRouting.scala
	target/scala-2.9.1/src_managed/main/routes_routing.scala
	target/scala-2.9.1/src_managed/main/views/html/signup/summary.template.scala