Merge branch 'develop'
Initial commit.
Includes placeholder.js within the head tags.
lost-password etc.
Merge branch 'master' into develop
Merge branch 'develop' into placeholder
Merge branch 'placeholder' into develop
Merge branch 'develop' of github.com:oniiru/filmbundle into develop