Bs3 ng1.2

clean up of the bs3 branch + merge from master

this aims to be a base for a more official bs3_ng1.2 branch