Changing <? to <?php
Merge branch 'master' of https://github.com/greatrat00/present

Conflicts:
	dev/application/views/edit_profile_v.php