Prepare for rc3.
Portal - updated grunt to remove old task types
Revert to launcher AppleJavaExtensions 1.4 so that at least the launcher will build.
Merge branch 'pr/73'.  This closes #73

Conflicts:
	.gitignore
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid