test to check git usage
New tab "Adjusting time period for resending messages" was added
minor change UI
changes in keys.dat, edit hours/days/months is working now, variable time_period inserted
feature_v1
feature_v2
feature1_v3_AQWA
merged
Implementing Moodlist
Implementing Moodlist. Fixing Whitelist bug
Implementing Moodlist. Fixing Whitelist bug. Should be fromAddress
Implementing Moodlist. Fixing Whitelist bug. Setting up new icons.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/class_receiveDataThread.py