Manual Merge

Merged all branches updated/created between 13th Nov 2012 and 20th Jan
2013