updated install
Merge branch 'dev' of github.com:marcoraddatz/candyCMS into dev
pre-merge
merge
merge