update gems
Merge pull request #12 from Thu-SaaS-CloudComputing/feature/authentification

Feature/authentification
fixed the time display on visitor index
Add and modify some rspec and cucumber tests
Merge remote-tracking branch 'origin/master' into feature/authentification

Conflicts:
	Gemfile.lock
Merge pull request #13 from Thu-SaaS-CloudComputing/feature/authentification

Feature/authentification
Merge branch 'master' into feature/article_uploader

Conflicts:
	config/routes.rb