Merge branch 'develop'
Buncha changes
Merge branch 'develop'

Conflicts:
	wp-content/themes/new-proxy-child-theme/header.php
more changes
mandrill etc.
fixed blog
couple small fixes
fix TML
few quick TML fixes
quick css fix
loss password fix
added autochimp
i hope
i hope!!
back again
Merge branch 'master' of github.com:oniiru/filmbundle
Updates the seed prod registration, to not rely on form, but user object, which should make it work with social login.
Merge branch 'master' into develop