Merge pull request #140 from voltan/master

Add parallax slider on widget module
phpDocumentor fix in process
phpDocumentor fix in process
phpDocumentor fix in process
phpDocumentor fix in process
phpDocumentor fix in process
Improved asset canonize to allow for mixed array
Merge branch 'develop' into phpdoc
phpdoc fix in process
phpdoc fix in process
Block style bug.
Block style bug.
Merge pull request #144 from voltan/master

Use bootstarp on setup
Merge pull request #145 from sexnothing/master

Block style bug
Merge branch 'develop' into phpdoc
phpdoc fix in process
Update README.md
Merge branch 'master' into develop
phpdoc fix in process
phpdoc fix in process