Changed CalculateWatt mechanism in BTS
Merge branch 'master' of https://github.com/ervteng/OMNET_GSM.git into rx_power

Conflicts:
	src/Makefile
	src/bts.cc
	src/gsmsim.ned
Fixed rssi reception issues. MAC now implements INET mac, also uses lastTransmissionTime to prevent collisions.
Fixed rssi reception issues. MAC now implements INET mac, also uses lastTransmissionTime to prevent collisions.