Updated coding style guide

Updated coding style guide based on 26 June 2014 UI Meeting