DO NOT MERGE Smartanswers: Simplified expense - V2 

https://www.pivotaltracker.com/story/show/71134196