Final state of Code'n'Cake 09/27/2013
Final result from Code'n'Cake 10/11/2013
Merge remote-tracking branch 'origin/master'