main.js
Merge branch 'release/29042014'
base code
Merge branch 'release/29042014-2'
fix few bugs
Merge branch 'hotfix/fix_bugs'