Action button images present. You should put them in.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Action button images present. You should put them in.