Merge branch 'dev' into test
Merge branch 'views' into i18n
devise edit profile localize
devise localization fix
Merge branch 'i18n' into dev
Merge branch 'dev' into test
all models tests
login user fixes
fix gemfile
Merge branch 'dev' into test
picture storage fixes
add controller tests
likes controller (100% coverage)
pictures controller tests
Merge branch 'test' into dev
routes with slug
fix SQL query
tests fix
Merge branch 'slug' into views