Merged develop.

Conflicts:
	base/lib/application.coffee