- merge branch
Merge branch 'master' of https://github.com/nightwolf93/Symfony-Insta

Conflicts:
	nbproject/private/private.xml