Merge branch 'develop' of https://github.com/web-candy/velobox into develop
Added filter to index-page; Added ordering functionality; Some other changes