commit to develop 02-05-14
Merge remote branch 'origin' into develop