Merge branch 'master' of github.com:vishal0071/upes-academics into vishal0071

Conflicts:
	licensesdialog/licensesdialog.iml
added smoothProgressBar as dependency

Bar similar to Google Now, replaces progressDialog
Merge branch 'master' of github.com:vishal0071/upes-academics into vishal0071
Merge remote-tracking branch 'upstream/master'

Conflicts:
	androidsupportv4preferencefragment/androidsupportv4preferencefragment.iml
	attendance/attendance.iml
	attendance/src/main/java/com/shalzz/attendance/fragment/AttendanceListFragment.java
	licensesdialog/licensesdialog.iml
Merge branch 'master' of github.com:vishal0071/upes-academics into master