Reduced Cyclomatic complexity of main::router()
Merge branch 'alpha' of ssh://10.0.0.7/home/hussein/Documents/www/codup.dev/codup into alpha
Bug fixes
Few other fixes and clean up
commented out debug code