Record
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/il/ac/tau/cs/wirelesslab/composites/RecordComposite.java
	src/il/ac/tau/cs/wirelesslab/views/ViewRecord.java