update to Q3 2014
Merge branch 'master' of github.com:littleark/githut