Merge branch 'master' into develop
move linkTo() to Helper.php
update boilerplate and add modernizr
add @media-query
rebuild poi
Merge branch 'develop'