Worked on Template AJAX switch
Fixed issue: Entity dialog did not close after saving
Increased version numbers to 06.03.06
Merge branch 'master'
Increased version numbers to 06.03.07