?
Merge branch 'luis' of https://github.com/PublialemDev/solaris into luis

Conflicts:
	application/views/main/vMain.php
a