Update UI - 15:15 PM - 08/07/2013
Merge remote-tracking branch 'origin/master'