Merge branch '20150325-cust_main-CurrentUser' of https://github.com/fozzmoo/Freeside...