bug 257
Merge branch 'unstable' of https://github.com/stestaub/drallo-app into unstable
Merge branch 'unstable' of https://github.com/stestaub/drallo-app into unstable