Guntoro 20141209

Guntoro portion done
Merge remote-tracking branch 'origin/master'

Conflicts:
	JohnnyRockets.mdb