Update 2013-01-31-applications.html
fix merge conflict applications