#392 Fix Removes Old j2.5 code.
#390 Fix missing path to administrator folder.
Merge remote-tracking branch 'upstream/development' into development