Filter buttons
Merge branch 'master' of https://github.com/raymondgh/expendables

Conflicts:
	autoexpense/platforms/ios/AutoExpense.xcodeproj/project.xcworkspace/xcuserdata/sasilukruangrongsorakai.xcuserdatad/UserInterfaceState.xcuserstate
	autoexpense/platforms/ios/www/expense.html
	autoexpense/platforms/ios/www/index.html
	autoexpense/www/expense.html
	autoexpense/www/index.html