BAPP-REGISTER first commit
Merge branch 'master' into BAPP-REGISTER

Conflicts:
	.idea/workspace.xml
merge
Merge pull request #2 from yasaracar/BAPP-REGISTER

Bapp register