Merge branch 'develop' into features/bootstrap_layout_design
Update indention in layout file
Update gitignore and add bootstrap layout tidbits
Merge branch 'features/bootstrap_layout_design' into develop