presentation commit
Merge branch 'master' of https://github.com/DanielLagin/TIS_2013

Conflicts:
	application/views/prednasky.php