Remove Podfile.lock
Add Podfile.lock into .gitignore
Merge branch 'feature/beacon_entry' into develop

Conflicts:
	Podfile.lock