save memory
Merge branch 'master' of https://github.com/Project60/org.project60.bic
Merge branch 'master' of https://github.com/Project60/org.project60.bic
Merge branch 'master' of https://github.com/Project60/org.project60.bic
Merge branch 'master' of https://github.com/Project60/org.project60.bic
fixed more stuff