Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Added launcher_wheel
Merge branch 'master' of git://github.com/anidev/612-2013
ports for feeder and launcher
Merge branch 'master' of git://github.com/anidev/612-2013

Conflicts:
	ports.h
Merge branch 'master' of git://github.com/anidev/612-2013

Conflicts:
	ports.cpp
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
change to state_shooting.cpp
Merge branch 'master' of git://github.com/anidev/612-2013

Conflicts:
	states/state_shooting.cpp
deleted duplicated line