Finished the application. Just need app icons.
Merge remote-tracking branch 'origin/master'