First pages commit
pulling from dev
Fixing merge conflicts
Buttons done except disabled
Stash
Updating forms
Updating buttons and forms