Merge branch 'develop'
few signup changes
Merge branch 'master' of https://github.com/oniiru/filmbundle

Conflicts:
	wp-content/themes/new-proxy-child-theme/headerlogin.php
Merge branch 'external-blog'
Merge branch 'master' of github.com:oniiru/filmbundle
Merge branch 'master' into develop