Fixed token registry import
Merge remote-tracking branch 'origin/master' into mmc_fixes

Conflicts:
	gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/rebind/PlaceTokenRegistryImpl.vm