ORM spec can run by itself
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs
added orm specs
Merge branch 'orm-specs' of https://github.com/rhomobile/RMS-Testing into orm-specs
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs
new model spec
Added ported specs from rc-client project related to database reset
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs

Conflicts:
	auto/feature_def/auto_common_spec/app/SpecRunner.html
	auto/feature_def/auto_common_spec/build.yml
new tests
merge
Adding OrmTest specRunner
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs

Conflicts:
	auto/feature_def/auto_common_spec/app/SpecRunner.html
	auto/feature_def/auto_common_spec/app/index.erb
tests
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs

Conflicts:
	auto/feature_def/auto_common_spec/app/SpecRunner.html
	auto/feature_def/phone_spec/app/spec_runner.rb
Merge branch 'master' of github.com:rhomobile/RMS-Testing into orm-specs