Merge branch 'master' of github.com:magnolia-fan/BeatHaven

Conflicts:
	config/routes.rb

config/database.yml

@@ -1,10 +1,14 @@
-# PostgreSQL version 9.0
-#   gem install pg
-development:
+defaults: &defaults
   adapter: postgresql
   database: beathaven
   host: 192.168.0.128
   username: postgres
   password: password
   pool: 5
-  timeout: 5000
+  timeout: 5000
+
+development:
+  <<: *defaults
+
+production:
+  <<: *defaults

config/routes.rb

@@ -20,6 +20,8 @@ Beathaven::Application.routes.draw do
   match 'reg/:email/:code' => 'user#register', :constraints => { :email => /[-a-z0-9\._@]+/i, :code => /[a-f0-9]{64}/ }
   match 'reg/complete' => 'user#complete'
   match 'login' => 'user#login'
+  match 'user/profile' => 'user#update'
+  match 'user/invite' => 'user#invite'
 
   match '*a', :to => 'errors#routing'
 end