wip
merging conflicts
wip admin section
Merge branch 'master' of github.com:santiagopiria/Sultanapp