7/2/14 general commit
140915 sync