First commit
Added few new applications
Merged conflicts