Adding devise
Merge branch 'translate_page' into users
Adding users
Merging latest master