Commit Something Code
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/libraries/extra_abs_0_9_3.xml
	.idea/libraries/library_0_2_0.xml
	.idea/libraries/menudrawer_3_0_6.xml
Commit Something Code