Scaffold out featuredVideo
Merge branch 'develop' into feature/featured-vid

Conflicts:
	app/Global.scala
	app/com/itsdamiya/legendary/actions/SecuredAction.scala
	app/com/itsdamiya/legendary/controllers/LeagueController.scala
	app/com/itsdamiya/legendary/controllers/SessionController.scala
	app/com/itsdamiya/legendary/controllers/UserController.scala
	app/com/itsdamiya/legendary/models/User.scala
	app/models/AuthToken.scala
	app/services/UserService.scala
	project/plugins.sbt

Conflicts:
	app/Global.scala
	app/com/itsdamiya/legendary/actions/SecuredAction.scala
	app/com/itsdamiya/legendary/controllers/LeagueController.scala
	app/com/itsdamiya/legendary/controllers/SessionController.scala
	app/com/itsdamiya/legendary/controllers/UserController.scala
	app/com/itsdamiya/legendary/models/User.scala
	app/models/AuthToken.scala
	app/services/UserService.scala
	project/plugins.sbt
Bunch of reformatting. Fix issue with session termination.
FInish cache validation.
Add unique username on index.
Drop seed data.
Merge branch 'release/0.0.4' into develop
Rev to 0.0.5-SNAPSHOT
Rev to 0.0.5-SNAPSHOT
Merge branch 'hotfix/0.0.4-1' into develop

Conflicts:
	package.json
	project/Build.scala
Merge branch 'develop' into feature/featured-vid

Conflicts:
	app/com/itsdamiya/legendary/Global.scala
Merge branch 'master' into develop
Merge branch 'master' into feature/featured-vid
Update to 2.3-20131213005945Z

Add filter to push connection to HTTPS.

Enable user creation for dev all the time (Disable for prod)
Update to 2.3-20131213005945Z

Add filter to push connection to HTTPS.

Enable user creation for dev all the time (Disable for prod)
Add logout logging
Misc
Snapshot proper.
Finish featured video
Merge branch 'feature/featured-vid' into develop
Finish featured video
Merge branch 'release/0.0.5'