1011
1038

shit
1039

damn it
1040

fuck
1040

remove that creep
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/footer.php