izmjena profila pocetak
Merge branch 'master' of https://github.com/nzekic/nwt-tutori
nesto
Merge branch 'master' of https://github.com/nzekic/nwt-tutori

Conflicts:
	app/assets/javascripts/angular/controllers/profile/ProfileCtrl.js
Merge branch 'master' of https://github.com/nzekic/nwt-tutori

Conflicts:
	app/controllers/messages_controller.rb
	app/views/messages/messages.json.jbuilder