merge
merge with samson
Merge branch 'samson'

Conflicts:
	.template/generate_dynamic/android_tasks.py
fixed top bar