sfdfd
Merge branch 'master' of https://github.com/seegan/Myproj

Conflicts:
	application/views/sidebar/register.php
hhj