Add in ubuntu 13.04
Add in ubuntu 12.10
Merge branch 'feature/ubuntu-12.10' into develop