Implemented auto expand
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	res/values/colors.xml
Implemented Autoexpand