Merge pull request #1 from rasmushaglund/master

Pull Test
New drop down form for the user application
Added fields to user application
Merge pull request #2 from rasmushaglund/master

Pull
Added controlls to user application
Merge pull request #3 from rasmushaglund/super-quiz

Super quiz
Added Email to table users
Merge pull request #5 from RikardNordstrom/master

Merge of new user registration process
Merge branch 'master' into super-quiz

Conflicts:
	app/Controller/UsersController.php
	partisk.sql
New database structure
Added controlls to the user application form
Merge pull request #4 from rasmushaglund/master

Pull
Merge pull request #58 from rasmushaglund/super-quiz

Super quiz
Merge pull request #5 from rasmushaglund/master

Pull
Merge pull request #74 from rasmushaglund/super-quiz

Super quiz
Added a unactivated role to Partisk.sql
Merge origin/master
Revert "Added a unactivated role to Partisk.sql"

This reverts commit 2aaeb09197330ecc6080c5c69af42faf820927c5.
Merge pull request #7 from rasmushaglund/master

pull
Added a unactivated role to Partisk.sql