vupttse90102 : update till 1:23PM 12/03/2014
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/scripts/services/UserService.js
	server/controllers/Users.js
vupttse90102 : update create ads/create auction/ view auction detail