Merge remote-tracking branch 'origin/master'

Conflicts:
	GimmeVibe.v12.suo
	GimmeVibe/bld/Ripple/Android/Debug/scripts/app/controllers/task.js