Merge pull request #22 from colombbus/dev

Dev
Merge origin/master
Merge commit '4705f25775a14c26dbf8a61260c8e4137e3b3978'
Merge commit 'b828f7ca2de4b7a10dc1c305d9117d48648c2453'
Merge commit '00a947c13c629bf28fd2d7ecb3a388b0a310014d'
Merge commit 'd36efd53a5e3c3ea697eed83b45556f944d1c6c2'
Merge commit '7be7b6a1acd4b9cc0ded286064f9988ab4820ed1'
Merge commit '521d22fc3e6027fb2a714a42e99ed1c68e264619'
Merge commit '198a33be63c4fbdffc4f4996ce0ba6c114abaf68'
Merge commit 'b314dcc2329bdc56da33a505717df871fe9c955e'
Merge commit '9dbf46702e981d4485310a98040bc1efede31670'
Merge origin/master
Merge commit '799a732fccb865efd3a59e45cc616211f5c5018c'
Merge commit '4a298c0d6e69b6bf37e7c9d39923859658d42d41'
Merge commit '34963838c5ac6151564d5ce3f263adb6699035b7'
Merge origin/master
Merge commit '9f457926fe732ac76b24e9e6c01470beb051920b'
Merge commit 'a2e3c1aaf0f1c11d30edc50a7c96c79b50404845'
Merge commit '462630229567fd2333e643709f80ead268aa75a1'
Merge origin/master