Merge branch 'master' into develop
Fix height issue
Prevent default in ngDrag
Fetch commands on boostrap
Merge develop