updated submodule references
Update README.md
Merge pull request #285 from huglester/patch-2

Update README.md
Bumped the docblock version to 1.7
fixed typo in the welcome views css
updated submodule references
corrected 'STAGE' to 'STAGING'
Merge pull request #286 from mp-php/patch-1

corrected 'STAGE' to 'STAGING'
removed build.xml, we don't use it anymore
updated composer
updated submodule references
fixed file permissions
updated composer
updated submodule references
added token_salt and allow_x_headers to the config example in app
updated submodule references
updated submodule references
Backported branch '1.7/develop' into 1.6/master
updated submodule references
fixed merge conflicts