Merge branch 'master' of https://github.com/pkubitsc/Computer_Systems_Initiative

Conflicts:
	Source/project/application/views/auth/register_form.php
	Source/project/images/register/ajax_loader.gif
	Source/project/images/register/cross.png
	Source/project/images/register/tick.png
Merge branch 'master' of https://github.com/pkubitsc/Computer_Systems_Initiative

Conflicts:
	Source/project/application/views/auth/register_form.php
	Source/project/images/register/ajax_loader.gif
	Source/project/images/register/cross.png
	Source/project/images/register/tick.png