more tests
tetst
Test
test

Merge remote-tracking branch 'upstream/master'

Conflicts:
	README
	components/com_battle/views/building/tmpl/default_factory.php
test
test
test
Attempting to sync my forked repo with upstream. I'm hoping the upstream's conflicts will overwrite mine
change login path to rrelative linking
change login path to relative
html changes to farm conveyor, added labels, wrapper elements, generic styles for input including readonly type, removed input width from bootstrap default, changed mootools setStyle from visibility to display
Merge pull request #17 from left23/master

Farm conveyor improvements