Merge remote-tracking branches 'origin/master' and 'origin/HEAD'
Merge branch 'master' of https://github.com/rhomobile/rhodes
Merge branch 'master' of https://github.com/rhomobile/rhodes
Pre-merge rholib.vcproj
Pre-merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	platform/wm/RhoLib/RhoLib.vcproj
Remove extensions.c
Merge remote-tracking branches 'origin/master' and 'origin/HEAD'
Merge branch 'master' of https://github.com/rhomobile/rhodes
Icon change, remove generated app_build_configs.c
Merge remote-tracking branches 'origin/master' and 'origin/HEAD'
Merge remote-tracking branches 'origin/master' and 'origin/HEAD'
Icon file changes
Add iPhone readme files
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Remove icons from git control
Ignore generated app_build_configs.c file
Icon files
Merge remote-tracking branch 'origin/master'

Conflicts:
	platform/shared/common/app_build_capabilities.h
	platform/shared/common/app_build_configs.c
	platform/wm/rhodes/rhodes.vcproj