more stuff
Merge branch 'master' of https://github.com/elsys/gradsys

Conflicts:
	diplomirane/app/assets/javascripts/application.js
Merge branch 'master' of https://github.com/elsys/gradsys

Conflicts:
	diplomirane/Gemfile
	diplomirane/app/views/layouts/application.html.erb