Composer.lock update

Signed-off-by: Julien Sanchez <sumbobyboys@gmail.com>
update gitignore

Signed-off-by: Julien Sanchez <sumbobyboys@gmail.com>
Add bower config

Signed-off-by: Julien Sanchez <sumbobyboys@gmail.com>
Merge branch 'develop' of github.com:kapla/scrumbag into develop

* 'develop' of github.com:kapla/scrumbag:
  SbAppBundle initial commit
  - add parameters config - add nbproject to gitignore

Conflicts:
	.gitignore

Signed-off-by: Julien Sanchez <sumbobyboys@gmail.com>