Merge pull request #17 from morpheyesh/0.5

0.5 - Conflicts resolved - Org and Dmn done.
Merge remote-tracking branch 'origin/master' into 0.5

f
Merge remote-tracking branch 'origin/0.5' into 0.5
org w/ acc tieup
organization set
Merge pull request #23 from morpheyesh/0.5

0.5 - org + acc tieup