Merge pull request #152 from fsek/seeds

Rake task to add first user as admin

Merge pull request #150 from fsek/FixCouncilPage

Fixing Council pages and lots of other things.

Fix extra argument in method call

Fix deploy error

Reload permissions table on deploy

Merge pull request #144 from fsek/migrationconflicts

Fix migration conflicts

Merge pull request #147 from fsek/js-test

Use poltergeist/PhantomJS for JS feature testing

Merge pull request #141 from fsek/revert-139-revert-88-cafebokning

Merge Cafebokning into master, third times a charm!

Merge pull request #139 from fsek/revert-88-cafebokning

Revert "Merge Cafebokning into master"

Merge pull request #88 from fsek/cafebokning

Merge Cafebokning into master