modal signup
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/Pages_Content.php
	application/views/footer.php
	application/views/header.php
	application/views/menu.php
charts and a lot of other stuff