Fixed base URL

Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
updated translation resources
updated translation resources
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
Fixed a bug where we weren't checking if a variable was empty before using it
Merge remote-tracking branch 'origin/2.5.x' into saas
Enable Japanese locale
Merge branch '2.5.x' into saas