refresh merge
Beleženje porabe časa.
minor changes to the database and respective files
tidied up the models
ups pozabu par datotek
Ustvarjanje taskov dela, I'm so hapy :D
Beleženje porabe časa.
Merge branch 'master' into darko

Conflicts:
	application/controllers/verifyAddTask.php
	application/controllers/viewTasks.php
	application/models/get_projects.php
	application/models/get_users.php
	application/models/projects.php
	application/models/stories.php
	application/models/task.php
	application/views/mytasks_view.php
	application/views/productbacklog.php
	application/views/viewTasks.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/mytasks.php
	modified:   application/controllers/productbacklog.php
	modified:   application/controllers/sprintBacklog.php
	modified:   application/controllers/unfinishedstories.php
	modified:   application/controllers/verifyaddproject.php
	modified:   application/controllers/verifyaddsprint.php
	modified:   application/controllers/verifyaddstory.php
	modified:   application/controllers/verifyadduser.php
	modified:   application/controllers/verifylogin.php
	modified:   application/controllers/viewTasks.php
	renamed:    application/models/project.php -> application/models/projects.php
	renamed:    application/models/get_sprints.php -> application/models/sprints.php
	modified:   application/models/tasks.php
	deleted:    application/models/user.php
	new file:   application/models/users.php
	modified:   application/views/addTask.php
	modified:   application/views/addstory_view.php
	modified:   application/views/adduser_view.php
	modified:   application/views/administration.php
	modified:   application/views/mytasks_view.php
	modified:   application/views/productbacklog.php
	modified:   application/views/selProject.php
	modified:   application/views/sprintBacklog.php
	modified:   application/views/viewTasks.php
Beleženje porabe časa.
fix 001
Manjše spremembe.
problemi....
Merge branch 'master' of github.com:trulex/TPO

trying to fix stuff001
deleting allready deleted stuff all over again
Merge branch 'lovrenca'
Merge branch 'master' of https://github.com/trulex/TPO into darko
checkout
manual override- fuck yourself
porpavki i guess
sprints, sprints everywhere