Added MainFrame instead of using JFrame
Added MainFrame instead of using JFrame
Merge branch 'develop'