.
Merge Jda - Master
Merge origin/JdaBranch4
Merge: Jda - Master
Changes in views and fixes some bugs in createEPS and Record