Update project files
Merge branch 'master' of github.com:bridgitt/bridgitt

Conflicts:
	.idea/libraries/support_v4_19_0_1.xml
	.idea/modules.xml
	Bridgitt.iml