Merge branch 'hf'
Merged in develop (pull request #1)

Merge branch 'hf' into develop
Added apache license
Upgraded some jquery plugins and  css
Merge pull request #1 from petecocoon/master

Bump