Moved super.onCreate() to end of onCreate() in NBaseApplication to
prevent data-loading race-conditions.

Changed exception-type in NMaseMapViewFragment
Merge remote-tracking branch 'origin/master'