more README
add TODO.txt and rename README.md to README.txt
ftp ignore README.txt
add license:proprietary to php/composer.json
upgrade font-awesome from 3.2.0 to 3.2.1
promote phpinfo to composer
Merge branch 'master' of /Users/neves/Dropbox/github/site-template
Merge branch 'master' into develop

Conflicts:
	component.json
	php/composer.json
	php/composer.lock
	php/tpl/layout/_vendors-css.php
ignore php/composer.lock