Navigation Changes

updated .htaccess to remove index.php from url pattern
update setupheader
resolved
Merge branch 'master' of https://github.com/BlackRussian/nextSIS

Conflicts:
	application/views/templates/setupheader.php
Revert "Merge branch 'master' of https://github.com/BlackRussian/nextSIS"

This reverts commit 38f206b33cf797be5bdf4eae0fd21b74d4842e12, reversing
changes made to 12f580b5a225ed69dc16a54fc7b5820ced4d4688.
Revert "resolved"

This reverts commit 12f580b5a225ed69dc16a54fc7b5820ced4d4688.
Revert "Navigation Changes"

This reverts commit fc10a6e5c8a141dcdf87d5ba3096a9660dbe0fad.