home page and active admin
Merge branch 'nikitin' into development