Merge branch 'Merge-Graz-3-21-2014' of github.com:curtislacy/omniwallet into Merge-269-270-271