Tickets 35, 37, 38, 39

https://github.com/easy-wi/developer/issues/35
https://github.com/easy-wi/developer/issues/37
https://github.com/easy-wi/developer/issues/38
https://github.com/easy-wi/developer/issues/39
Merge branch 'master' of https://github.com/easy-wi/developer