commiting flash alerts
fixed conflict in upload file html
Commiting Alerts- Chnages to service
commiting update
Merge remote-tracking branch 'origin/0.1.1a' into 0.1.1a_v1