Added automatic country and city extraction from SM or IP address
Added automatic country and city extraction from SM or IP address
Added loginLog
Merge branch 'april_tasks' of https://github.com/CCI-MIT/XCoLab into april_tasks

Conflicts:
	portlets/loginregister-portlet/src/main/java/org/xcolab/portlets/loginregister/exception/UserLocationNotResolveableException.java
	portlets/loginregister-portlet/src/main/java/org/xcolab/portlets/loginregister/singlesignon/FacebookController.java
	portlets/loginregister-portlet/src/main/java/org/xcolab/portlets/loginregister/singlesignon/OpenIdController.java
Added see more toggle in feeds portlet
Redesign feeds portlet
Fixed feeds icons and added feeds length constraint
Merge branch 'refs/heads/feeds' into april_tasks
Readded LoginLog service declaration
tiny css change and added exception
Merge branch 'refs/heads/master' into april_tasks