Merge branch 'master' of git://github.com/mkriele/MCInsurance.jl

Conflicts:
src/Invest/Invest_Invest.jl
src/Invest/Invest__Types.jl
src/Proj/Proj_CFlow.jl
test/CFlow.jl
test/load_data.jl
merged
merged2
get former state back