Merge pull request #1 from WTF-Limited/ui_skeleton

Ui skeleton
Merge pull request #2 from WTF-Limited/ui_skeleton

Added user model. Support user registration, login, logout now.
Merge pull request #3 from WTF-Limited/ui_skeleton

Check if user logged in when accessing App resources, with Pundit gem.
Merge pull request #5 from WTF-Limited/jimmychu

More models and pop a dialog box when creating new app
Upgrade to bootstrap 3; added header to match www
Merge pull request #6 from WTF-Limited/jimmychu

Added a user_slug field & generation and also update to use bootstrap 3....
Merge branch 'master' of https://github.com/WTF-Limited/portal

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/shared/_header.haml
Merge pull request #7 from liahsheep/master

Layout change
* Basic create/show of apps
* Some code style issue
Known issue: app#show will show all apps, regardless of user
Merge commit 'e558e33f6236f6c124d6e3d55f8ea4145b540120' into jimmychu

* commit 'e558e33f6236f6c124d6e3d55f8ea4145b540120':
  Upgrade to bootstrap 3; added header to match www

Conflicts:
	Gemfile.lock
Limit scope to app's user(s)
I18n
I18n for devise forms
* Auto assign app type, app url and custom url to App
* Changed column "type" to "app_type"
Merge pull request #8 from liahsheep/master

Basic create/show of apps & I18n
Deployment script
Merge commit 'e147829b948b49d4544852bd070b9ba566e29b36' into jimmychu

* commit 'e147829b948b49d4544852bd070b9ba566e29b36':
  * Auto assign app type, app url and custom url to App * Changed column "type" to "app_type"
  I18n for devise forms
  I18n
  Limit scope to app's user(s)
  * Basic create/show of apps * Some code style issue Known issue: app#show will show all apps, regardless of user

Conflicts:
	app/models/app.rb
	app/models/profile.rb
	config/application.rb