Merge branch 'feature/Flexbox' into develop

Signed-off-by: Adam Hjerpe <adam.hjerpe@hotmail.com>
Merge branch 'Development' of https://github.com/AdamHjerpe/Grid into develop