fixed stuff
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	auto_encoders.cpp