Merged with master
Fixed Bullets Directory to be src and lib for be Release and Debug