Victor Woeltjen 766e94ed62 Merge remote-tracking branch 'origin/master' into persist-on-mutation-825b ...

Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js

2016-07-25 16:30:49 -07:00

..

LocationCapabilitySpec.js

Merge remote-tracking branch 'origin/master' into persist-on-mutation-825b

2016-07-25 16:30:49 -07:00