Merge current master into it Add aup checkbox into the form Add blazerid field into the form

Still not 100% working like the master branch, put it here as an example code.