fixed migrations
merge with master
fixed build error
test
clean project
merge with johns latest stuff