removed capty parts
Merge branch 'master' of github.com:marcoraddatz/candyCMS
Merge pull request #27 from marcoraddatz/master

3.0 -> 3.1