<unstable> fix define
<unstable> Merge branch 'unstable' of github.com:stestaub/drallo-app into unstable