Merge pull request #4 from gregoriot/master

Merged branches
25/10/14
26/10/2014
04-11-2014
10-11-2014
12-11-2014
19-11-2014
22-11-2014
23-11-2014
26-11-2014
28-11-2014