ilham commit
Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
	www/css/ilham/sidebar-style.css
	www/css/ilham/timeline.css
	www/css/login.css
	www/demo/calendarDemo.css
	www/demo/calendarDemo.js
	www/demo/index.html
	www/index.html
	www/js/app.js
	www/js/controllers.js
	www/js/directive.js
	www/js/factory.js
	www/templates/applogin.html
	www/templates/apps/assignment.html
	www/templates/apps/assignment/create.html
	www/templates/apps/assignment/detail.html
	www/templates/apps/assignment/turnIn.html
	www/templates/apps/callendar.html
	www/templates/apps/callendar/add_groupCalendar.html
	www/templates/apps/callendar/add_memberCalendar.html
	www/templates/apps/callendar/create_event.html
	www/templates/apps/callendar/detailCalendar.html
	www/templates/apps/callendar/event_friends.html
	www/templates/apps/callendar/event_group.html
	www/templates/apps/callendar/event_member.html
	www/templates/apps/collab/acts.html
	www/templates/apps/collab/book.html
	www/templates/apps/collab/create.html
	www/templates/apps/collab/createPage.html
	www/templates/apps/collab/createTask.html
	www/templates/apps/collab/participants.html
	www/templates/apps/friends.html
	www/templates/apps/friends/addDetailFriend.html
	www/templates/apps/friends/createFriend.html
	www/templates/apps/friends/detailFriend.html
	www/templates/apps/group.html
	www/templates/apps/group/create.html
	www/templates/apps/group/join.html
	www/templates/apps/home/comment.html
	www/templates/apps/home/home.html
	www/templates/apps/home/posting.html
	www/templates/apps/home/posting_friends.html
	www/templates/apps/home/posting_group.html
	www/templates/apps/homes.html
	www/templates/apps/library.html
	www/templates/apps/library/bookmarks.html
	www/templates/apps/library/create_lib.html
	www/templates/apps/library/create_lib_file.html
	www/templates/apps/library/create_lib_url.html
	www/templates/apps/library/group_library.html
	www/templates/apps/library/list_group_library.html
	www/templates/apps/library/my_library.html
	www/templates/apps/library/public_library.html
	www/templates/apps/library/share_group_library.html
	www/templates/apps/logout.html