refactored form alapps
a
Merge remote-tracking branch 'origin/master'
"How to merge?"