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
Merge branch 'master' of /Users/neves/Dropbox/github/site-template
ignore php/composer.lock