Fixed the compile units issue
Added dynamic editing
Updated the aliases and settings
Updated
Updated
Merge branch 'pull_atpaton_20141113205628546'