try again
Merge branch 'VOLDEV-30' of github.com:WikiaVolDev/app into VOLDEV-30