Aron 30/07
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design