LOTS-o-Changes committed
Merge branch 'master' of github.com:rolturn/gateway-2012-annual-report