R.A.-Added in obstacle movement components for hor/vert movement
as well as scaling shifts on regular intervals.
R.A.-Meh?
Merge branch 'master' of https://github.com/tehr0b/heartillery

Conflicts:
	Assets/-tk2d.asset
	Assets/Plugin Examples/NGUI/Models/Orc Armor/Materials/orc.mat
	Assets/Plugin Examples/NGUI/Models/Orc/Materials/orc_col_1.mat
	ProjectSettings/ProjectSettings.asset
Merge branch 'master' of https://github.com/tehr0b/heartillery
R.A.-commit metafiles to appease the git lords