Merge branch 'hotfix/2013W31.f'
PLATFORM-1166 # bump cache manifest for hot fix to Forms v2
Merge branch 'hotfix/2013W31.i' into develop

Conflicts:
	appcache/common.manifest