some changes
fixed conflicts
Merge branch 'elastic' of https://github.com/feelos0ff/targetmaker.git
into elastic

Conflicts:
	buildering/build.py
fixed conflicts
Merge branch 'elastic' of https://github.com/feelos0ff/targetmaker.git
into elastic
add rake