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

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

Gem update
Fix user view
NoMethod error after filtering list of users
Better look of user lists
Add barcode to user model
Confirm user participation in lecture
Fix footer
Merge branch 'participation-confirmation' into develop
Merge branch 'sptq-develop' into develop

Conflicts:
	app/views/users/index.html.erb
Merge pull request #66 from vircung/develop

Barcodes and participation confirmation
Add search engine and fix styles
Add group controller
Add SIW
remove school options
js fix
js fix
Fix texts on page