Sync repo
Merge branch 'master' of https://github.com/ksenechal/BootstrapFX

Conflicts:
	.gitignore