Merge upstream/master to rails 4 upgrade
fix user registrations in test
fix layout with image-url
remove precompiled assets
fix strange redirect after pw change