updates 7-25-2014
Merge branch 'master' of github.com:patjan/erp