added
Merge remote-tracking branch 'origin/master'
refactored activitys (state pattern + Abstract class)