changes 12_14_2013
changes
new api
Merge branch 'origin/master'

Conflicts:
	WebContent/campaigns.jsp
	src/com/satya/Servlets/AdminUserServlet.java