regular integration
Merge branch 'master' of https://github.com/j5shi/OpenBTS

Conflicts:
	SRIODriver/SRIODriver.py