Updating
Merge branch 'master' of https://github.com/dimamedia/ftf-framework

Conflicts:
	ftf.png
	view/header.php