Merge remote-tracking branch 'swarage/master'

Conflicts:
	SmoothJoystick.cpp
	SmoothJoystick.h
Merge branch 'master' of github.com:anidev/612-2014
fixed content
fixed content
fixed content
Merge branch 'master' of github.com:anidev/612-2014 (1/8/2014 merge in the morning)
Revert "Initial commit"

This reverts commit 1965c1b0caa066bb10605ffbfb95c0de09981b48.

Conflicts:
	.gitignore