yml if condition
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge pull request #88 from indykish/0.5

rails 4.2.0 beta2, angularjs 1.3.0 rc2 and jquery 2.1
varai integration
Merge pull request #89 from rajthilakmca/0.5

varai integration
Merge remote-tracking branch 'origin/0.5' into 0.5
gem lock
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
local storage riak init
Merge pull request #90 from thomasalrin/0.5

0.5 local storage init
local storage riak
Merge pull request #91 from thomasalrin/0.5

local storage riak
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
Removed old dead code.