Merge conversions_update2 into master#83

Merged

Ayuto merged 17 commits intomasterfrom

conversions_update2

Nov 19, 2015

Commits on Nov 9, 2015

Commits on Nov 13, 2015

Commits on Nov 14, 2015

Fixed 3 stupid mistakes
Ayuto
committed

Commits on Nov 17, 2015

Merged master and fixed conflicts in sp_main.cpp.
satoon101
committed

Commits on Nov 19, 2015

Fixed error checking in two FromBaseHandle conversions
Ayuto
committed