Nevtep/omniwallet — pull request #1 by curtislacy (2014-04-03 15:23:43+00:00)
Title: Bring the pricing branch up to date with master

Also fix one conflict.