fixing stuff
merge
fix001
editanje sprintov OK
editanje projekta OK
Merge branch 'master' into darko

Conflicts:
	application/controllers/verifyadduser.php

	modified:   application/controllers/addTask.php
	modified:   application/controllers/addproject.php
	modified:   application/controllers/addsprint.php
	modified:   application/controllers/addstory.php
	modified:   application/controllers/adduser.php
	modified:   application/controllers/administration.php
	modified:   application/controllers/editproject.php
	modified:   application/controllers/home.php
	modified:   application/controllers/mytasks.php
	modified:   application/controllers/productBacklog.php
	modified:   application/controllers/sprintBacklog.php
	modified:   application/controllers/unfinishedstories.php
	modified:   application/controllers/verifyAddTask.php
	modified:   application/controllers/verifyaddproject.php
	modified:   application/controllers/verifyaddsprint.php
	modified:   application/controllers/verifyaddstory.php
	modified:   application/controllers/verifyadduser.php
	modified:   application/models/project_user.php
	modified:   application/models/projects.php
	modified:   application/views/addsprint_view.php
	modified:   application/views/editproject_view.php
	modified:   css/styles.css
merge
Merge branch 'master' of github.com:trulex/TPO
merged master into my branch
editanje sprintov OK
Merge remote-tracking branch 'origin/boco'
checkout
merged
fixed some stuff
After hours of painstakingly looking for the cause of the error it turns out a semicolom was missing... again...
error message added to change difficulty form
zobies are rising, MUHAHAHAHAHAHAHA
Fixed missing difficulty next to story name, fixed add task.