- Clean up Application class (Contains now start and stop methods) /3
Merge remote-tracking branch 'origin'