Merge pull request #64 from vircung/develop

User cannot attend overlaping lectures
Merge pull request #65 from vircung/develop

Gem update
Fix user view
Merge branch 'sptq-develop' into develop

Conflicts:
	app/views/users/index.html.erb